Merge "Fix cross source dependencies for github"