New feature in ESD #15

The following feature is new for ESD #15: