PLFM-2526
Merge pull request #1030 from brucehoff/release-28

PLFM-2526