HBASE-9136 changes