NSS wrapper pre-upstream development