Fixed onSuccess()/onError() callbacks for auto validation
Merge