Bascott/upstream rebase