UI-776: Changed whitelabel and added some new fields
Merge remote-tracking branch 'origin/master'