prepare to fix disks
Merge branch 'origin/master'