Merge branch 'master' into 'dev'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for dev in 38 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Build
passed k8s #42225

00:00:30

 
  Test
passed test #42226

00:00:07