Fix DELTASPIKE-370, DELTASPIKE-371 and DELTASPIKE-372