Merge branch 'bug_9045' into 3.12-master