Merge branch 'bug_2835' into 3.12-master