Merge branch 'master' into 2-edit-menu

2 jobs for 2-edit-menu in 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #7100
static_code_analysis

00:00:04

 
  Build
passed #7101
build

00:00:10