Merge pull request #1004 from brucehoff/develop

PLFM-2397 follow-up