UI-2916: Improvement Variables less - Update for plf