fix for issue #3704
unit test update for issue #3704
Merge pull request #3706 from serkan-ozal/fix/3.x/issue-3704

Backport to maintenance branch Fix/3.x/issue 3704