WINDUP-222: Add variable name till the WINDUP-296 is resolved.