Merge "Decouple single scan and pno scan"