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