re-rebase (fix issues from branching)