Merge changes  into nss