Features in issue 2462