DADATA-425 type always goes first now
sug-181 fixed stack overflow while token validation
sug-181 fixed stack overflow while token validation (merge)