This is related to T61660, but actually does not fix that specific issue (which is even worse - outside-of-Main ID using inside-of-Main IDs... yuck).
This is related to T61660, but actually does not fix that specific issue (which is even worse - outside-of-Main ID using inside-of-Main IDs... yuck).