[OTIM-363] OTIM-363