Merge remote-tracking branch 'origin/EMFTVM_Compat'