Merging HCFS work into trunk.