[Tutti-commits] branch feature/6116 deleted (was d782989)