add latest changes from upstream service