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