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