6.17.0-rc7-g347afa390427