Include changes of dev

I'm already starting this pull request, so we don't forget to include changes from `dev`. Editing work hasn't finished though.