Merge "Update new permission logic to use flagging." into main