Merge previous commits from feature/development #18

Closed ywarnier closed 3 years ago