Merge branch 'dev' into 'master'

Dev

See merge request !8
latest