Merge "Revert "Ravenwood/HostStubGen refactor and bug fixe"" into main