Upgrade to NSB 4.0 on master