Features in issue 2502