Update the file size flash message
Merge branch 'develop'
Get some info during token mismatches
Merge branch 'develop'