Merge source for 0.8.10.1 from private repo