Encode/Decode finding detail
Merge commit 'bdd5ba42e3887d9713878dd10dbe215eb1e747c8' into HEAD