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