EB:6971- Changes for the watermark bug
EB-6958. fixed order multiple variable name.