PLFM-2666

This PR merges the 'patch' made in release-36 into release-37