Merge branch 'dev-refactor' into 'master'

Dev refactor

See merge request !3
1 job for master in 24 seconds (queued for 1 second)