Merge "Fix crash while editing QS" into nyc-dev