rebase nw patches
DEPS for branch
rebase fix