Merge pull request #890 from john-hill/PLFM-2231

moved to a new ID generator
Merge branch 'release-23' into develop