fix OOIION-1318
Merge pull request #1618 from carueda/OOIION-1318_rebase

fix OOIION-1318
Looks good. EH. Consider added or extending an existing integration test if sensible.