Merge latest Dallinger PRs from Jazkarta

List of possible PRs to be merged:

Edited by Frank Höger