Corrected class inheritance structure.
Merge branch 'release-2.1'