This is sub-issue 1. Parent: #16571 Related: #16574 All temporary IDs should be resolved to actual issue numbers.