Merge remote-tracking branch 'origin/upstream_release_3_0_13' into tr-integ-fr-3...