PLFM-2666

This PR merges the 'patch' created for release-36 into the develop branch.