[2.6.x] Adding back catch all perm