New feature in ESD #9

The following feature is new for ESD #9: