PR that merges the permissions UI into 3.x

#4636