Intent to backport OAK-3930

[Amit Jain]

Hi,

The fix for issue OAK-3930 is required for 1.2 branch. All the tests
including ITs pass locally after merging the fix locally.

Thanks
Amit