Merge branch 'develop' into feature/#113-easy-configurability

4 jobs for feature/#113-easy-configurability in 3 minutes and 15 seconds