MSK-246: Too much free space
Merge remote-tracking branch 'origin/master'