#1765: #1763: additional changes
opened by thuchacz