GPII-85: temporary save while helping nick fixing his issues