Merge branch 'dev' into 'master'

Commons fix

See merge request !5
1 job for master in 1 minute and 8 seconds (queued for 1 second)