RELEASE-NOTES: synced with 173160c0d068