Adding support for the storages-aware version of the static tag.