Merge "Prevent ClassCastException" into sc-v2-dev