BK-1187 Implement note tab in the editor
Fixing conflict on merge branch