Merge pull request #13484 from TencentBlueKing/changelog/v4.2.0-rc.6