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