[OTIM-391] OTIM-391