Origin rebase

This rebase with latest from root repository.  This would allow opening a PR back to the original repository with fixes for load.