8.5 snapshot 79828 tools permissions.merge