[Tutti-commits] 04/07: Merge branch 'release/4.0.2'