New feature in v3.1.x