Merge cbrightsci fork into main project.

Same as above