Move Spec
lifters out of Constraints
#1575
Merged
Spec
lifters out of Constraints
#1575