Merge pull request #1564 from rpv-tomsk/disk-plugin