RELEASE-NOTES: Synced with c5399c827d