Merge "Check for ProjectID enablement made more performant"