Could somebody merge @mamhoff ‘s PR https://github.com/solidusio/solidus_support/pull/95 as it fixes issues for some extensions that we are working on.