WINDUP-222: WAdd variable names till the WINDUP-296 is not resolved.