Merge "Continue work with PolicyControl"