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