[Tutti-commits] branch feature/7157 deleted (was 5d5af52)