Tweak to constraints file
Merge branch 'develop' into aj/constraints
Merge remote-tracking branch 'origin/aj/constraints' into develop