Hack to change import sort order to '<' before '"'
Merge branch 'change_sorting' into global_integration