merge "master" to "intl-fr"