RELEASE-NOTES: Synced with 4febbedc5a