Fix a couple of copy pasta errors: Virtually the same code 5 times, and the last two copies did not update the set routine
Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch