Features in issue 2509