#1433: #1415 and readthrough edits
opened by TillmannTaape