Merge pull request #1025 from brucehoff/release-28

PLFM-2526
PLFM-2526