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