Peer review of #679