Merge branch 'bug_7921' into 3.12-master