Merge pull request #14178 from apache/release-dev

Release: 5.0.2