HBase-12090 patch