PLFM-2515
Merge pull request #1127 from brucehoff/PLFM-2515

PLFM-2515