Sync with stoney (only change is role constraints)