Merge branch 'bug_6554' into 3.12-master