DOL-67: prevent accidental clashes in generated PM ids
Merge remote-tracking branch 'origin/master'