HBase-11898 patch