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