Merge branch 'dev-lx' into 'dev'

Dev lx

See merge request !169
Status Job ID Name Coverage
  Package
canceled #338396
package

canceled #338391
package

 
  Deploy
canceled #338392
deploy