HBase-12565 patch