Resolve forgotten merge conflicts from tag 3.4.12