Merge "Add new fields for carrying classpath information"