[SPAY-213] SPAY-213