VIPER-25476

VIPER-25476