Conflicts resolved with #955