Merge branch 'master' into 2-edit-menu

2 jobs for 2-edit-menu in 1 minute and 19 seconds
latest
Status Name Job ID Coverage
  Test
passed static_code_analysis #7096

00:01:09

 
  Build
passed build #7097

00:00:10