Merge branch 'FEX-Emu-extended_features' into dev