RELEASE-NOTES: synced with 8723cade21fb