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