Merge branch 'chore/dependency-bump' into 'master'