Should we create an issue to remind us to come back and revisit this after the dmg branch has be updated with pull request 14