Merge "Rename SingleShot to SingleShotFix"