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