Refresh after merge with upstream (more to come)