Merge branch 'bug_9688' into 3.12-master