Recreation of #686

Recreating #686 for evaluation into our actual release branch, rather than the now-deleted candidate.