Merge branch 'update/lamp' into 'master'

Sync with upstream

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

00:00:18