Added branch NAS-2380