cherrypick from trunk: [fr] ajustements