Merge conflict merging dev into feature/215-ant-update-metaxml

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