Merge branch 'bug_9930' into 3.12-master