Merge "Improved encoder threading"