Merge: from main Catching up assets to the point of failure (I hope?) - still trying to reproduce NRE during server bundle generation