RELEASE-NOTES: Synced with 159c3aafd8