Merge cbrightsci fork into main project.

Ditto