Merge branch 'f1-blind_mocks' into QA