RELEASE-NOTES: synced with 68542e72a9