#1197: #1196, #1141

opened by TillmannTaape