Merge cbrightsci fork into main project.

@cbrightsci Yeah definite tab/space issue