Merge branch 'bug_9689' into 3.12-master