#1130: #1047 and misc

opened by TillmannTaape