Merge branch 'ak/cat-file-clean-up'