Merge branch 'bug_9995' into 3.14-master