More updates for upstream changes