Merge branch 'bug_9008' into 3.12-master