module merged upstream