RELEASE-NOTES: synced with b5478a0e033e7