Merge branch 'eap-constraints'