Merge branch 'sh/finish-tmp-packfile'