Described herein are methods and apparatus for jointly encoding components of a a channel state information (CSI) report into a single codeword. Padding bits are added to equalize payload size for different CRI/RI cases and to allow encoding of all parts of CSI into one codeword without payload ambiguity.