Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
1 job for master in 1 minute and 59 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed lint #4642

00:01:59