RELEASE-NOTES: Synced with bd3df5ec6d