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