This is a new features so it requires a CHANGE and release notes entry. (cherry picked from commit 1728599684)
1728599684