adjustments for mainline merge