PDI-10242
What was done
1. Added encoding lookup in variables