Merging right away. I've put this in a separate branch to make sure CI runs through. Fixes #1625 (moved).