Merge branch 'bug_9526' into 3.12-master