Merge "Fixed a bug where the QS could get stuck" into lmp-dev