Merging a handful of topics before -rc2