Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
1 job for master in 1 minute and 40 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Test
passed #4552
lint

00:01:40