Merge "Fix for encoder slowdown (for speeds >= 3)"