PLFM-1933, applied to release-w
Merge pull request #467 from brucehoff/release-w

PLFM-1933, applied to release-w