RELEASE-NOTES: synced with c43127414d89