[nw10] rebase fix on mac