Replace doc_comments_and_attrs
with collect_attrs
#16073
Merged
doc_comments_and_attrs
with collect_attrs
#16073