Merge with upstream, version update