Noticed that 2.1.x line has this issue also and we need this patch backported to 2.1.x line
GitHub Pull Request #1732
HBASE-24312 porting HBASE-24199 to 2.1 branches