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