Fixed incosistenties and reordered config blocks
Merge pull request #2247 from WouterJ/reorderd_config_blocks

[Constraints] Fixed incosistenties and reordered config blocks