Signed-off-by: Ayush Saxena <ayushsaxena@apache.org> (cherry picked from commit d77c7ab4e0604484ec3c48ac2acb32ea71a53d9a)