Revert "Revert "Merge branch 'F2' into QA""

This reverts commit 96430be8f97c2162b3114fb1d185feba44077b72.