Added branch NAS-2385.