REP-0140: copy editorial changes from relevant parts of REP-0127; fix references