Fix image upload after token expiration
Merge branch 'develop'