Merge branch 'bug_9592' into 3.12-master