Added label for edge (server side)
Merge remote-tracking branch 'origin/master' into editor_migration