Refs PR #241 Pushing one of the changes, moving regenerateId() higher
Merge remote-tracking branch 'origin/master'