Revert "Revert "Revert "Revert "Revert "Merge branch 'refs/heads/topic/custom-attr-rewrite' into ait-qa"""""

This reverts commit 18b5d7a7d7e4a1128bcc414d37a171672bc970ce.