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

This reverts commit e7a79eac593cc6f037cd165584b83bdedb73b5a7.