(cherry picked from commit e391844e8e414abf8c94f7bd4719053efa3b538a) Co-authored-by: Ayush Saxena <ayushsaxena@apache.org>