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