v8.35 release fixure
spread 8.35 across samples