Merge "Fix QS expansion weirdness #2" into lmp-dev