Merge branch 'feature/nginx-metrics' into 'master'

Feature/nginx metrics

See merge request !5