Manually copy and paste updates from upstream to support parameters in include statements