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