Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx