[Tutti-commits] branch feature/7536 deleted (was b15c54b)