Merge "CP StationaryThrottling bugfixes from SC QPR1" into main