Update for fat32 devices
Update for rider21
Merge branch 'master' into rider20