Merge "fix sahara base class"