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

This reverts commit 30163d6f184a0a64208a74db9f425891fb3155fc.