Merge "fixed an enc/dec mis-match issue" into experimental