Imports latest changes from project's origin.

- Bug fixes after scandio started using it internally