Merge branch 'master' into feature/deduplicate-puppet-code-6842