Merge pull request #17492 from jefferyto/python-attrs-21.4.0