Merge branch 'bug_9902' into 3.12-master