Merge branch 'dev' into 'master'

Dev

See merge request !22
1 job for backendsecfitsmells in 58 seconds