issue #3541 : Update from develop branch
Merge pull request #1454 from SmallAiTT/iss3541_4_testCase

issue #3541 : Update from develop branch