7426b3fa91
Partial cherry-pick of 5d4dc2d45c.
Co-authored-by: Juan Linietsky <reduzio@gmail.com>
Partial cherry-pick of 5d4dc2d45c.
Co-authored-by: Juan Linietsky <reduzio@gmail.com>