Merge branch 'bug_9145' into 3.12-master