Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into int_tr65_nra_2.3.1