Fixed bug using multiple devices with PME
Fixed a bug in a test case
Merge remote-tracking branch 'origin/master' into qc