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