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