Merge "Update QuickScrub tip according to the latest spec." into pi-dev