BC-440 metrics
Merge branch '2.0.x' of git@github.com:soluvas/soluvas-web.git into 2.0.x