Cleanup static initializers.
Merge branch 'feature/hotfix-v3.0.1' into develop