Update class membership information.
Update class membership information.
Merge branch 'staging'