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

fix OOIION-1372; includes new specific test