Added WebApollo support to branch