upstream merge & cumulative changes