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