issue #3541 : Update from develop branch

Update from develop branch.