Merge "pno scan metrics"