This change is done after merging the origin into local