Merge branch 'patch-release'

Commit

2 years ago

Merge branch 'patch-release' # Conflicts: # .git-blame-ignore-revs # package.json # yarn.lock