Signed-off-by: Madhan Neethiraj <madhan@apache.org> (cherry picked from commit b8255d418e67a6bb01b9c3c4d2bce1cc2f24df4f)