Preparing fork to upstream changes.