Reviewed-by: Ayush Saxena <ayushsaxena@apache.org> (cherry picked from commit 1c1cf64616f34d039cf9246da9613914aa870515)