PLFM-2477
Merge pull request #1055 from brucehoff/develop

PLFM-2477