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