Merge branch 'sp/clip-read-write-to-8mb'