Merge branch 'bug_9151' into 3.12-master