RELEASE-NOTES: Synced with 3aa1329e0a