Merge branch 'bug_7919' into 3.12-master