Merge "Work on QS landscape fitting" into nyc-dev