Merge branch 'bug_9908' into 3.12-master