Upstream - Classloader changes and interact limiter changes