#1766: #1763: last bits for this issue
opened by thuchacz