SUMO-12582 Code review comments