Merge "WAN and stash cache notes"