Merge branch 'bug_9196' into 3.12-master