[PATCH 0/3] Improve VPN property saving and property management