Merge branch 'bug_9466' into 3.12-master