Merge branch 'master' into key-aware-chunk-reader
adding c.hinput code to combine hinput files