Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !231
Status Job ID Name Coverage
  Package
canceled #342877
package

 
  Deploy
canceled #342878
deploy