[SPRO-036] SPRO-036