Merge branch 'bug_9496' into 3.12-master