fix OOIION-1318
Merge pull request #1619 from carueda/OOIION-1318_rebase2

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