Merge "Fix class inheritances in base.py"