Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
1 job for master in 243 minutes and 58 seconds (queued for 3 seconds)
latest
Status Job ID Name Coverage
  Test
failed #5718
lint

04:03:58

 
Name Stage Failure
failed
lint Test The script exceeded the maximum execution time set for the job
Running with gitlab-runner 12.4.0 (1564076b)
on runner-bastion-git2 57294368
ERROR: Job failed: execution took longer than 1h0m0s seconds