Commiting missing updates and PerfCounter plugin..
Merge commit 'a6e399a22f5de7f6eba3ca96a4b2c99cdb8eb04a'