Merge "Fix classpath exclusion"