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