Merge branch 'bug_9377' into 3.12-master