Merge pull request #11703 from unghost/master

Fix Bug 908343 and Bug 908350(cherry picked from commit b582aaafdab26e78c2c4288c2b439d72d68dc9a4)