UI-3327 Organize the variables
Merge commit 'db4b78ce112bef89b8be8e7df82deda3de678a2d' into HEAD