Merge branch 'hotfix/vxx'
change html to html.erb for metrics
Merge branch 'hotfix/fixmetrics' into develop