Merge branch 'bug_9179' into 3.12-master