Merge "Ensure QS contains at least 6 tiles." into pi-dev