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