Merge branch 'bug_9116' into 3.12-master