- Contributed by Sneha Vijayarajan (cherry picked from commit b612c310c26394aa406c99d8598c9cb7621df052)