RELEASE-NOTES: synced with 831f6dd1d986c9