#714: #556: more changes
opened by thuchacz