Merge branch 'bug_9609' into 3.12-master