Merge "Ensure alpha is reset on QS expansion" into main