Merge pull request #1079 from JeffPyeBrook/pr-data-map-auto-restore-bug-fix

Data map fixes
Merge remote-tracking branch 'upstream/master'