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