Merge branch 'bug_9017' into 3.12-master