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