Merge "SquidUpdate cleanups"