CFY-516 exclude feature fixes