Merge "Bugfix for PMU leakage test"