Merged by hand (because GitLab won't let me rebase for some reason surely nobody understands), thanks
closed