I've reworked https://github.com/solidusio/solidus/pull/5635, rebasing it on main - It's also a prerequisite for the promotion extraction, and I think a pretty easy review. Happy Weekend!