Support for type-casting
Merge commit '6bcb9896884175b0e71e50f69f32fc2573f590d9'

* commit '6bcb9896884175b0e71e50f69f32fc2573f590d9':
  Support for type-casting