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