Merge tag 'LIV_TRC6500_2.3.1' into dev_tr65_nra_ft881_spu_node_exit