RELEASE-NOTES: synced with e608324f9f9