Merge remote-tracking branch 'origin/release_1.17.0'