Merge branch 'bug_9256' into 3.12-master