Merge "Fix an enc/dec mismatch issue in DRL experiment" into nextgenv2