Merge change 21296 into eclair

* changes:
  Fix a class cast exception.