PLFM-1787
Merge pull request #344 from brucehoff/release-1.21

PLFM-1787