[[ Bug 13400 ]] Prevent type conversions between text and binary where possible
Merge pull request #1151 from runrevali/bugfix-13400

[[ Bug 13400 ]] Prevent type conversions between text and binary where p...