Merge "Unflag new permission GID implementation and remove legacy code." into main