Added checks for the presence of the p-state driver
Merge branch 'dev'