TODO (see Manual release for inspiration)