Merge "property changed to enable role sync"