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