Merge "Replace can managed scope enforce methods"