Master merge jupiter 10.0.0