SM-13565 Formatting fix/delegate