Merge pull request #1455 from qnet-herwin/virtual_server_peap