fix OOIION-1584
Merge pull request #1611 from carueda/OOIION-1584_rebase2

fix OOIION-1584
Looks good. EH