Merge upstream 0.17.0 release