Merge pull request #6085 from etactica/master-tpl-fixes