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

This reverts commit 49aece93327cc9af77b424f8e1dcd6e750adacb3.