more reordering logic, bugfix for xml config
Merge branch 'develop' into ui/dev