Merge "Fix comments for encoder controls"