[rb32] rebase fix for win