Merge branch 'bug_9257' into 3.12-master