Merge "Fix a class cast exception" into main