Merge pull request #408 from xschildw/PLFM-1859-2

Missed one
Merge branch 'release-t' into develop