This backport request was opened because a customer thought it might be related to an infinite import issue with prefabs.
The code for this particular fix has been rethought upstream, and will need to be reworked for backporting, so this is being closed until a specific customer need arises.