Merge branch 'bug_9647' into 3.12-master