Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/pilots' into pilots
GPII-97: Went through all Claudias windows inverse transformations, checked/fixed them. Also fixed a minor issue in the windows part of the solution registry, and changed the naming of some preferences sets to make it clear what they're changing