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