Merge commits from main repo

These commits show fix the sdcard mounting issues