Merge branch 'fix/prometheus-test' into 'develop'