Merge branch '0.8'