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