[release-notes: 2/2] Safe merge