Admin and core modifications to save and restore correct permissions #74477