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