Features in issue 2461