Included Updates from upstream and new load functionality.