some more merges after boegels PR