[OTIM-338] OTIM-338