Merge branch 'fix-silence-mount-failures' into 'master'