Changes according to upstream branch