Merge branch 'bug_9605' into 3.12-master