Merge branch 'ps/doc-packfile-vs-pack-file'