Merge branch 'M4LAB-423' into 'testing'

M4 lab 423

See merge request !100
1 job for testing in 9 seconds (queued for 1 second)