Combined sagemaster branch with masterSage branch.