Merge "Ravenwood/HostStubGen refactor and bug fixes" into main