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