Features in issue 2491