HBASE-11591 - Addendum based on HBASE-11894