Merge branch 'bug_9695' into 3.12-master