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