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