AI-499 : consolidated undoables by HasValue