Revert "QA 1"

This reverts commit 68a48771d7e3b5c7a0bffdc3faa67570bf9f70d6.
Revert "Revert "QA 1""

This reverts commit 493ff2e82e6323685f667ddc5747546bde102bf6.