Merge branch 'bug_9632' into 3.12-master