Merge branch 'bug_9650' into 3.12-master