CLOUD-229 add validation for UI
CLOUD-229 image changes
Fix binary merge conflicts