Merge "Recognize and ignore options '-ea' and '-da'"