RELEASE-NOTES: synced with 0187c9e11d079