merge recent commits in the upstream