RELEASE-NOTES: Synced with 99303bcde5