c0ecdf152d
Merge commit '21bd4af88a24d0df020f68683f7c60698ebcc76a' * commit '21bd4af88a24d0df020f68683f7c60698ebcc76a': Simplify the VPN service implementation.