update from patch HDFS-4629