BK-1197 Implement new Settings tab in the editor
Merge branch 'BK1197' into 2.0