Export shows valid mappings for controls now..
Merge remote-tracking branch 'origin/feature/control_import_fixes' into feature/control_import_fixes