[fr] merge last commit (cherrypick)