Merge branch 'bug_9476' into 3.12-master