UI-3327 Organize the variables
Merge commit '8c3a89a39b84b87cdcdce43c744557b958e00471' into HEAD