[Tutti-commits] 07/09: Fix release merge