HDFS-5595: WIP 6