New feature in ESD #7

The following feature is new for ESD #7: