Ah whoops, this MR was supposed to target the branch from MR !299. But the way I submitted it, it's targeting master instead. Please review only the eponymous top commit, the rest will disappear once !299 goes into master and this MR gets rebased on top of that.