Also adjusted the pre-release process to prevent future omissions. Backport of c9c0be31c5 from master