Merge branch 'bug_9912' into 3.12-master