UI-3327 Organize the variables
Merge commit '0216c4f49055c768f59e95852c41e495ad269fa6' into HEAD