Merge "Add flag to control implementation of all private space features" into main