lock to metriks 0.9.9.5
Merge branch 'master' into staging