Prepare to merge upstream from hubwizard