Also includes a fix that I somehow didn't spot in !473 (merged). To be cherry-picked to 2018-patches.