HDFS-5616: comments