- Previous PR would overwrite new and existing values improperly (cherry picked from commit 7ab3f755ce)
7ab3f755ce