[nw11] rebase fix for mac