Merge branch 'master' into 'production'

CSIndicators after 1.1.1

See merge request !75
2 jobs for production
in 10 minutes and 6 seconds, using 0 compute credits, and was queued for 2 seconds
latest