Features in issue 2456