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