Cleans up constraints and adds LambdaCmsExtensions
Merge extensions into master