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