Merge "Lock Private space at the end of PS setup." into main