Issue #2351729: Fix bugs for static class.
Issue #2351729: Move plugins to use the container.