Merge branch 'bug_9523' into 3.14-master