upstream runtime changes