PLFM-2485
Merge pull request #987 from brucehoff/release-26

PLFM-2485