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