Merge "Fix documentation for trim cmd" into stable-3.5