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