nlsr: Updating to the latest merged version