How many transport blocks can be multiplexed on a carrier in on TTI in NR?

Hi folks, a question on MIMO in 5G.
At max, how many transport blocks can be multiplexed on a carrier in on TTI in NR?
I remember the limit is 2 in the case of LTE.

In 5G also 2. 1 TB up to RI = 4.

1-4 layers is 1TB. 5 to 8 layers is 2 TB.

Thanks all for the clarification.