Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev