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