Added perf metrics
Merge remote-tracking branch 'origin/master' into perf-refactoring