Try temp dir
Resolved conflict
Merge pull request #1659 from xschildw/PLFM-2920-port

Plfm 2920 port