Merge branch 'rc/constrain'