Fix deferred enc/dec params and fallback (#6500).
Merge remote-tracking branch 'drebs-github/bug/6500_fix-deferred-enc-dec' into release/0.6.x