Removing finished branch NAS-2124