Merge branch '0.20.0'