* finished feature * simplified logic from pr comments * added checking for disableNonToken back in
Attach a file by drag & drop or click to upload
