Resolve conflicts in #1741

Superseeds #1741