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