do not merge. rebase of !1703. Should be force pushed to !1703 if it's working again. Something went wrong in the rebase so the test fails.
