Merge branch 'work.hpfs' into work.lookup