Merge "Fix crash due to no corresponding class rule." into main