merge devel and next

Fixes a conflict between `devel` and `next`.