Merge "Fix a enc/dec mismatch under CONFIG_MISC_FIXES"