merge lastest NCL (2.1.19)