Merge branch 'bug_9617' into 3.12-master