Finalize #411, which addresses the performance counter and statistics.

[AiredaleDev]

The work done in #411 synced with the changes to master. I wanted to push to the original, but did not have access rights.