Merge branch 'release/upgrade-patch'
Merge branch 'master' into develop