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