Merge "Some updates to QS prototype based on new mocks"