Merge branch 'bug_9693' into 3.12-master