Additional work for VIX-433.