Merge branch '0.17.0' into upstream