HBASE-26357 Addendum include HBASE-25804