Merge "ProjectionSpace fixes for caching:" into sc-dev