New feature in ESD #24

The following feature is new for ESD #24: