Merge "Fix weird QS Edit bug" into nyc-dev