pull in fixes for edit constraints from upstream
pull in fixes for edit constraints from upstream

babelsberg/babelsberg-r,babelsberg/babelsberg-r,babelsberg/babelsberg-r,babelsberg/babelsberg-r,babelsberg/babelsberg-r