RELEASE-NOTES: Synced with dd07e79023