Merge branch 'bug_5079' into 3.12-master