SOLID-22972

SOLID-22972