[OTIM-396] OTIM-396