[OTIM-393] OTIM-393