Merge branch 'dev' into fix/consistentIndentation

Nothing to say here...