[OTIM-397] OTIM-397