rebase g-b branch onto upstream master