Merge "Fix prometheus stats and perfomances dashboards"