Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken * commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578': Fix for bug 2558156: Encodig is null
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken * commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578': Fix for bug 2558156: Encodig is null