Merge pull request #1655 from xschildw/PLFM-2920b

Try temp dir
Merge branch 'develop' into PLFM-2920b