SpArk-22596

SpArk-22596