#943: #901 and various others

opened by TillmannTaape