Adding back welcome changes so that it can be pushed upstream