Intent to backport OAK-8115, OAK-8112

[Amit Jain]

Hi,

I would like to backport changes for OAK-8115 & OAK-8112 to 1.10 branch and
these are low risk.

Thanks
Amit