Change data type
Merge branch 'bug-18312-wrong-casts-fixed'