Merge "Add Scan to tuner"