Ready for merge.

Merge some updates from OptiGraph for summer workshop.

Delete this branch after approved.