RELEASE-NOTES: Synced with d24b7953c2132a