Merge branch 'bug_9134' into 3.12-master