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