master-rebase fixes