[SPAY-536] SPAY-536

Release: None