[2.6.x] Adding back the "catch all" permission