Merge branch 'bug_9669' into 3.12-master