Merge branch 'bug_9141' into 3.12-master