[SPAY-529] SPAY-529

Release: None