Merge "Fix anonymous class error" into main