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