Sync with release-0.16.x