#744: #726: last bits

opened by thuchacz