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

This reverts commit e35dd2de538f8a4b5b9c3e783ef0d922a77afaaf.