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