Merge "Fix ClassCastException"