Pull from upstream

Pull the latest changes from upstream repository