Merge branch 'develop' into feature/#18-icon

2 jobs for feature/#18-icon in 1 minute and 52 seconds (queued for 1 second)