Merge "Create temp refs on proxies." into pi-dev