Merge branch 'bug_9698' into 3.12-master