Rebase addIso branch

I believe this rebases the branch so that your PR to Sylius can be merged. If you rather would like me to submit another PR to Sylius directly, let me know.