Merge branch 'bug_9656' into 3.12-master