Merge "Update with correct private space settings strings" into main