[1.6.x] Added release note for #21358