Merge branch '2.8-May-4th' into flashSeekFix