Merge branch 'master' into dependabot/npm_and_yarn/semantic-release/github-12.0.5

Author: mtrezza