All code included updated to dedicated upstreams