2 Years Ago
Cherrypick 85726 (water NRE in editor)