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