XD-1309: Skip option validation when doing completion