This shouldn't affect the 3.2.2 rollup. I'll hold off on mucking up the control screens, etc until later. #452