Merge "QS prototype work"