HDFS-6099: comments