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