Merge "Fix: classes with constructors only shouldn't be skipped." into main