Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
1 job for master in 1 minute and 52 seconds
latest
Status Job ID Name Coverage
  Test
passed #4431
lint

00:01:52