Changes according to changes in upstream branch