Merge tag 'disk_static' into develop

Tag
Merge branch 'release/RELEASE'