Merge branch 'release/disk_static'
Merge tag 'disk_static' into develop

Tag