(cherry picked from commit 1207180aa8) Co-authored-by: Gabriel Luong <gabriel.luong@gmail.com>
1207180aa8