Rebase on develop from upstream project