UI-3327 Organize the variables
Merge commit '2d15251fe378ec91309f4fe92749c2c5cdfd9b9c' into HEAD