#NO_ISSUE Constraints refactoring
Merge pull request #253 from drexin/wip-refactor-constraints-drexin

#NO_ISSUE Constraints refactoring