RELEASE-NOTES: Synced with bde901ad89a6f1