Refactor validation of configuration integrity constraints
Merge remote-tracking branch 'origin/dev' into edit