RELEASE-NOTES: synced with e116d0a62