Merge branch 'bug_9521' into 3.12-master