#1481: #984: miscellaneous EdComm consistency tasks
opened by thuchacz