Features in issue 2445