Merge changes from master, fix some algebra representation issues.
Rename conflicting shared example names.