Merge branch 'dev#152400_electre_ng' into 'master'

Dev#152400 electre ng

See merge request !3
1 job for master in 38 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #37912
docker
test:php7_latest

00:00:38