Merge branch 'bug_9002' into 3.12-master