Bug 833236: Add WAPI support