Merge "Update permissions" into p9.0