Merge branch '0.70-support'