Merge "Install non-working WSI functions if not enabled" into nyc-dev