Fixing Issue_857
Merge remote-tracking branch 'remotes/origin/Issue_857' into 3.5_RC_4