RELEASE-NOTES: Synced with e7da67f5d3