Merge "Fix bad command length calculation"