CRM-2073: Performance issue with upgrade to latest version
CRM-2073: Performance issue with upgrade to latest version
CRM-2073: Performance issue with upgrade to latest version
BAP-5523: Channel management. Make preselected first channel type
BAP-5523: Channel management. Make preselected first channel type
Merge pull request #1092 from laboro/fix/CRM-2073-master

Fix/crm 2073 Performance issue with upgrade to latest version
BAP-5523: Channel management. Make preselected first channel type
  - fixes after review
Merge pull request #1094 from laboro/fix/BAP-5523-master

BAP-5523: Channel management. Make preselected first channel type
Merge remote-tracking branch 'remotes/dev/master'