DELTASPIKE-340 changed placeholder
DELTASPIKE-339 intermediate fix