STRIDER-2551

STRIDER-2551