Merge "Fix crash with MMI code *#06#"