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