Rebase of upstream stable/havana