upstream integration