Merge "Add defineClass variant" into main