Merge pull request #1101 from david22swan/CONT-773/main/puppet_8