Merge "Fix incorrect VPN time" into klp-dev