RELEASE-NOTES: synced with 378af08c992