MR for Matej for MTI bug fix