fix OOIION-1372; includes new specific test
Merge pull request #1569 from carueda/fix_OOIION-1372b_rebase2

fix OOIION-1372; includes new specific test