Merge branch 'bug_9335' into 3.12-master