Merge changes from topic "jc/mte_enable" into integration