Refactoring MetricsProfiler.java
Merge remote-tracking branch 'origin/develop' into develop