Merge branch 'cb/maint-report-mount-point-correctly-in-setup'