Merge branch 'fr_2.41.0_rnd1' of github.com:jnavila/git