Merge branch 'bug_7593' into 3.14-master