Updated benchmark classes.
Merged branch '2.7.x' into 'master'.