Cast parameters to strings
Merge branch '4.0'