Fixes https://app.asana.com/0/11607779860336/18887116812777
Merge origin/1.0-branch into 1.0-branch