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