RELEASE-NOTES: synced with e305f5ec715f