Merge conflict merging dev into feature/253-build-package-xml

mrbelvedere tried to merge new commits to dev but hit a merge conflict.  Please resolve manually