Merge branches '3.12-master' and 'bug_7143' into bug_7143