RELEASE-NOTES: synced with a8c92cb60890