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