Thanks for the reply. As suggested by dmertz and confirmed by you, I will split the 1099-R into two, one for the taxable amount, and the other for the non taxable amount. Hopefully, Turbotax will address this issue in the future updates.
Best regard.
