Add new class description.
Merge branch 'staging'