sync branches

Merging master back into dev-master due to an inadvertent push after a rebase.

This introduced duplicate commits with different SHAs in both branches. The
duplicated commits have the commit message "fix flaky test" and have the SHAs
3b1b302 (master) and 3568d7d (dev-master).

As part of the rebase, the following commits should get reintroduced into
master with this merge.
1d4a48d
641f056
128072c