Merge branch 'bug_9591' into 3.12-master