Merge "Fixes ClassCastException crashloop." into main