Merge "Workaround for class loader issues in verifier."