GPII-925: temporary save