Can I have a merge for https://github.com/solidusio/solidus/pull/6090? It's been approved by three people, and only red because codecov complains. Given that I'm not adding any new code here, just moving stuff, I think this can go in.