Merge branch 'bug_9003' into 3.12-master