Merge pull request #1099 from brucehoff/release-32

PLFM-2600